Add code completion for C++20 keywords. #107982

16bit-ykiko · 2024-09-10T08:17:32Z

This commit adds code completion for C++20 keywords, fix #107868.

complete concept in template context
- template<typename T> conce^ -> concept
- conce^
complete requires
- constraints in template context: template<typename T> requi^ -> requires
- requires expression: int x = requ^ -> requires (parameters) { requirements }
- nested requirement: requires { requ^ } -> requires expression ;
complete coroutine keywords
- co_await^ in expression: co_aw^ -> co_await expression;
- co_yield in function body: co_yi^ -> co_yield expression;
- co_return in function body: co_re^ -> co_return expression;
specifiers: char8_t, consteval, constinit

…uires, char8_t.

llvmbot · 2024-09-10T08:18:02Z

@llvm/pr-subscribers-clang

Author: ykiko (16bit-ykiko)

Changes

This commit adds code completion for C++20 keywords.

complete concept in template context
- template<typename T> conce^ -> concept
- conce^
complete requires
- constraints in template context: template<typename T> requi^ -> requires
- requires expression: int x = requ^ -> requires (parameters) { requirements }
- nested requirement: requires { requ^ } -> requires expression ;
complete coroutine keywords
- co_await^ in expression: co_aw^ -> co_await expression;
- co_yield in function body: co_yi^ -> co_yield expression;
- co_return in function body: co_re^ -> co_return expression;
specifiers: char8_t, consteval, constinit

Full diff: https://github.com/llvm/llvm-project/pull/107982.diff

1 Files Affected:

(modified) clang/lib/Sema/SemaCodeComplete.cpp (+69)

diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 88d4732c7d5c6a..4647d65430b8c3 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -1837,6 +1837,10 @@ static void AddTypeSpecifierResults(const LangOptions &LangOpts,
       Builder.AddChunk(CodeCompletionString::CK_RightParen);
       Results.AddResult(Result(Builder.TakeString()));
     }
+
+    if(LangOpts.CPlusPlus20){
+      Results.AddResult(Result("char8_t", CCP_Type));
+    }
   } else
     Results.AddResult(Result("__auto_type", CCP_Type));
 
@@ -1889,6 +1893,10 @@ AddStorageSpecifiers(SemaCodeCompletion::ParserCompletionContext CCC,
     Results.AddResult(Result("constexpr"));
     Results.AddResult(Result("thread_local"));
   }
+
+  if (LangOpts.CPlusPlus20) {
+    Results.AddResult(Result("constinit"));
+  }
 }
 
 static void
@@ -1912,6 +1920,9 @@ AddFunctionSpecifiers(SemaCodeCompletion::ParserCompletionContext CCC,
   case SemaCodeCompletion::PCC_Template:
     if (LangOpts.CPlusPlus || LangOpts.C99)
       Results.AddResult(Result("inline"));
+
+    if (LangOpts.CPlusPlus20)
+      Results.AddResult(Result("consteval"));
     break;
 
   case SemaCodeCompletion::PCC_ObjCInstanceVariableList:
@@ -2254,6 +2265,10 @@ AddOrdinaryNameResults(SemaCodeCompletion::ParserCompletionContext CCC,
     [[fallthrough]];
 
   case SemaCodeCompletion::PCC_Template:
+    if (SemaRef.getLangOpts().CPlusPlus20 && CCC == SemaCodeCompletion::PCC_Template)
+        Results.AddResult(Result("concept", CCP_Keyword));
+    [[fallthrough]];
+
   case SemaCodeCompletion::PCC_MemberTemplate:
     if (SemaRef.getLangOpts().CPlusPlus && Results.includeCodePatterns()) {
       // template < parameters >
@@ -2266,6 +2281,11 @@ AddOrdinaryNameResults(SemaCodeCompletion::ParserCompletionContext CCC,
       Results.AddResult(Result("template", CodeCompletionResult::RK_Keyword));
     }
 
+    if(SemaRef.getLangOpts().CPlusPlus20 && 
+      (CCC == SemaCodeCompletion::PCC_Template || CCC == SemaCodeCompletion::PCC_MemberTemplate)) {
+      Results.AddResult(Result("requires", CCP_Keyword));
+    }
+
     AddStorageSpecifiers(CCC, SemaRef.getLangOpts(), Results);
     AddFunctionSpecifiers(CCC, SemaRef.getLangOpts(), Results);
     break;
@@ -2487,6 +2507,14 @@ AddOrdinaryNameResults(SemaCodeCompletion::ParserCompletionContext CCC,
       Builder.AddPlaceholderChunk("expression");
       Builder.AddChunk(CodeCompletionString::CK_SemiColon);
       Results.AddResult(Result(Builder.TakeString()));
+      // "co_return expression ;" for coroutines(C++20).
+      if (SemaRef.getLangOpts().CPlusPlus20) {
+        Builder.AddTypedTextChunk("co_return");
+        Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
+        Builder.AddPlaceholderChunk("expression");
+        Builder.AddChunk(CodeCompletionString::CK_SemiColon);
+        Results.AddResult(Result(Builder.TakeString()));
+      }
       // When boolean, also add 'return true;' and 'return false;'.
       if (ReturnType->isBooleanType()) {
         Builder.AddTypedTextChunk("return true");
@@ -2707,6 +2735,47 @@ AddOrdinaryNameResults(SemaCodeCompletion::ParserCompletionContext CCC,
         Builder.AddChunk(CodeCompletionString::CK_RightParen);
         Results.AddResult(Result(Builder.TakeString()));
       }
+
+      if (SemaRef.getLangOpts().CPlusPlus20) {
+        // co_await expression
+        Builder.AddResultTypeChunk("");
+        Builder.AddTypedTextChunk("co_await");
+        Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
+        Builder.AddPlaceholderChunk("expression");
+        Results.AddResult(Result(Builder.TakeString()));
+
+        // co_yield expression
+        Builder.AddResultTypeChunk("");
+        Builder.AddTypedTextChunk("co_yield");
+        Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
+        Builder.AddPlaceholderChunk("expression");
+        Results.AddResult(Result(Builder.TakeString()));
+
+        // requires (parameters) { requirements }
+        Builder.AddResultTypeChunk("bool");
+        Builder.AddTypedTextChunk("requires");
+        Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
+        Builder.AddChunk(CodeCompletionString::CK_LeftParen);
+        Builder.AddPlaceholderChunk("parameters");
+        Builder.AddChunk(CodeCompletionString::CK_RightParen);
+        Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
+        Builder.AddChunk(CodeCompletionString::CK_LeftBrace);
+        Builder.AddChunk(CodeCompletionString::CK_VerticalSpace);
+        Builder.AddPlaceholderChunk("requirements");
+        Builder.AddChunk(CodeCompletionString::CK_VerticalSpace);
+        Builder.AddChunk(CodeCompletionString::CK_RightBrace);
+        Results.AddResult(Result(Builder.TakeString()));
+
+        if(llvm::isa<clang::RequiresExprBodyDecl>(SemaRef.CurContext)){
+          // requires expression ;
+          Builder.AddResultTypeChunk("");
+          Builder.AddTypedTextChunk("requires");
+          Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
+          Builder.AddPlaceholderChunk("expression");
+          Builder.AddChunk(CodeCompletionString::CK_SemiColon);
+          Results.AddResult(Result(Builder.TakeString()));
+        }
+      }
     }
 
     if (SemaRef.getLangOpts().ObjC) {

github-actions · 2024-09-10T08:21:19Z

✅ With the latest revision this PR passed the C/C++ code formatter.

clang/test/CodeCompletion/keywords-cxx20.cpp

16bit-ykiko · 2024-09-10T10:26:30Z

Also test with clangd, it works well.

shafik

What about module, import and export?

16bit-ykiko · 2024-09-13T09:36:30Z

What about module, import and export?

Yes, I miss them and will add soon.

cor3ntin

This change needs a release note.
Please add an entry to clang/docs/ReleaseNotes.rst in the section the most adapted to the change, and referencing any Github issue this change fixes. Thanks!

clang/lib/Sema/SemaCodeComplete.cpp

16bit-ykiko · 2024-09-23T14:57:06Z

This change needs a release note. Please add an entry to clang/docs/ReleaseNotes.rst in the section the most adapted to the change, and referencing any Github issue this change fixes. Thanks!

I an not sure which section I should add in clang/docs/ReleaseNotes.rst? There isn't a section related to code completion.

16bit-ykiko · 2024-09-23T14:59:46Z

What about module, import and export?

Added, but I am not sure how to test them. Do I need a actual input module file or just use name started with mod like modulexx to test it.

zyn0217 · 2024-09-30T02:31:11Z

I am not sure which section I should add in clang/docs/ReleaseNotes.rst? There isn't a section related to code completion.

@16bit-ykiko There is an individual file for clang-tools-extras clang-tools-extra/docs/ReleaseNotes.rst which covers changes in clangd. See also #105975.

(AFAICT, for a long time, clangd hasn't had a practice for updating its release notes whenever new features are implemented, but the situation is getting improved recently.)

clang/lib/Sema/SemaCodeComplete.cpp

cor3ntin · 2024-10-10T14:44:12Z

clang/lib/Sema/SemaCodeComplete.cpp

+        // export
+        Results.AddResult(Result("export", CodeCompletionResult::RK_Keyword));
+
+        if (SemaRef.CurContext->isTranslationUnit()) {


Should we restrict that using getCurrentModule()->Kind @ChuanqiXu9 ?

i think we can't do it here. Since we don't the kind of the current module before we see module declarations.

Well, exactly.
If we haven't see module;, we should propose module; and export module
If we have seen module; - we should not propose it again
If we have seem export module, we should not propose import

I push a new commit and try to make completion for module related keywords more context-sensitive.

And found something strange: https://godbolt.org/z/YM9dhEKKe

module; export module M; ^

If I try to run code completion at ^, only get a compiler error.

<source>:3:1: error: export declaration can only be used within a module purview 3 | export mo<U+0000>dule M;

The error shouldn't occur, right?

It only happens during completion so there is probably a bug with that https://godbolt.org/z/7M8EPodoP

I made some modification to ParseExportDeclaration to fix the problem.

clang/lib/Sema/SemaCodeComplete.cpp

clang/lib/Parse/ParseDeclCXX.cpp

16bit-ykiko · 2024-11-12T14:51:12Z

@cor3ntin Can we merge this PR? :)

cor3ntin

LGTM

16bit-ykiko added 3 commits September 10, 2024 14:59

add co_return, co_await, co_yield, consteval, constinit, concept, req…

fedea9e

…uires, char8_t.

make concept and requires more sensitive to context.

36a0db2

Merge branch 'llvm:main' into complete-cxx20-keywords

9a1a85c

llvmbot added clang Clang issues not falling into any other category clang:frontend Language frontend issues, e.g. anything involving "Sema" labels Sep 10, 2024

format.

326892a

zyn0217 requested review from HighCommander4 and kadircet September 10, 2024 09:13

16bit-ykiko added 2 commits September 10, 2024 17:13

format and add test.

c8e555f

fix.

0375e52

zwuis reviewed Sep 10, 2024

View reviewed changes

clang/test/CodeCompletion/keywords-cxx20.cpp Outdated Show resolved Hide resolved

add newline in eof.

d9c6413

shafik reviewed Sep 13, 2024

View reviewed changes

cor3ntin reviewed Sep 17, 2024

View reviewed changes

clang/lib/Sema/SemaCodeComplete.cpp Outdated Show resolved Hide resolved

add module keyword and Char8.

3764782

16bit-ykiko added 2 commits September 24, 2024 20:56

Merge branch 'main' into complete-cxx20-keywords

08dc216

Merge branch 'main' into complete-cxx20-keywords

585bc0a

16bit-ykiko added 2 commits October 10, 2024 21:59

Merge branch 'main' into complete-cxx20-keywords

e802aec

Update ReleaseNote.

2d7f476

cor3ntin reviewed Oct 10, 2024

View reviewed changes

16bit-ykiko added 3 commits October 11, 2024 14:24

Remove extra braces.

d489327

Update test file.

5cc6a8f

Fix test.

74b7c74

Merge branch 'main' into complete-cxx20-keywords

687ab4c

zyn0217 reviewed Oct 11, 2024

View reviewed changes

clang/lib/Sema/SemaCodeComplete.cpp Outdated Show resolved Hide resolved

16bit-ykiko added 4 commits October 11, 2024 17:52

Remove extra brace.

cc758c5

Make completion for module keyword more context sensitive.

15f6982

Fix unexpected compiler error when code complete in export mod^.

b6218b6

Remove .clangd.

75bb471

zyn0217 reviewed Oct 12, 2024

View reviewed changes

clang/lib/Parse/ParseDeclCXX.cpp Outdated Show resolved Hide resolved

16bit-ykiko added 2 commits October 12, 2024 18:35

Some format.

68cd292

Merge branch 'main' into complete-cxx20-keywords

cf991be

cor3ntin approved these changes Nov 26, 2024

View reviewed changes

cor3ntin merged commit ec4c47d into llvm:main Nov 26, 2024
9 checks passed

16bit-ykiko deleted the complete-cxx20-keywords branch December 24, 2024 12:49

Add code completion for C++20 keywords. #107982

Add code completion for C++20 keywords. #107982

Uh oh!

Conversation

16bit-ykiko commented Sep 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Sep 10, 2024

Uh oh!

github-actions bot commented Sep 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

16bit-ykiko commented Sep 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shafik left a comment

Choose a reason for hiding this comment

Uh oh!

16bit-ykiko commented Sep 13, 2024

Uh oh!

cor3ntin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

16bit-ykiko commented Sep 23, 2024

Uh oh!

16bit-ykiko commented Sep 23, 2024

Uh oh!

zyn0217 commented Sep 30, 2024

Uh oh!

Uh oh!

Uh oh!

cor3ntin Oct 10, 2024

Choose a reason for hiding this comment

Uh oh!

ChuanqiXu9 Oct 11, 2024

Choose a reason for hiding this comment

Uh oh!

cor3ntin Oct 11, 2024

Choose a reason for hiding this comment

Uh oh!

16bit-ykiko Oct 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cor3ntin Oct 11, 2024

Choose a reason for hiding this comment

Uh oh!

16bit-ykiko Oct 12, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

16bit-ykiko commented Nov 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cor3ntin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

16bit-ykiko commented Sep 10, 2024 •

edited

Loading

github-actions bot commented Sep 10, 2024 •

edited

Loading

16bit-ykiko commented Sep 10, 2024 •

edited

Loading

16bit-ykiko Oct 11, 2024 •

edited

Loading

16bit-ykiko commented Nov 12, 2024 •

edited

Loading